bitkeeper revision 1.1473 (428d01b2u1JOg4f95CAjC08qwbmHCg)
authorakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Thu, 19 May 2005 21:14:26 +0000 (21:14 +0000)
committerakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Thu, 19 May 2005 21:14:26 +0000 (21:14 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk

1  2 
tools/python/xen/xend/Blkctl.py
tools/python/xen/xend/server/blkif.py

Simple merge
Simple merge